Revert 4b43b2e..4cb7e0f

This rolls back to commit 4b43b2ea7f4a32b7a0eccf596e27e01d07c260b7.
DEATH by pigman