Revert "Hulk smash your changes"

This reverts commit 4f9a421e62b179350b755b2a5569e0a6c83306b9.