Revert "VOODOO"

This reverts commit d07c76414bf1eb47a8e4c0d68c64d73e8a3d01ab.