Revert "Hack"

This reverts commit 5d16b51d539a5889596a4ef218b25972534e7f28.