Revert "Try voodoo fix."

This reverts commit 9e7cdc3526413893b75e2c877b8a016edb2f0d46.