Revert 4353015..34f9552

This rolls back to commit 4353015eb77efd71b6f20f211a2920281f702723.
prep for ghast hunting