Revert "doin' some voodoo"

This reverts commit 46dfc74c2992d1675e8c12c93a3ec0912119eec2.