This reverts commit e3b0f4a51ebaaa5469d7340b640f6b8bf3473113. Bah, this was a bad idea, wrong way to do it