Revert "hack"

This reverts commit a54c8e3e3574f49dbe2ef7bc0795b1b185724263.
Revert "Revert "hack""

This reverts commit b502e0f33b14f041f8450ef9c2d933aab45ee1da.