Revert 1827edb..9a0bd55

This rolls back to commit 1827edb4fc0d729c362c6b155f3d7acb201061b6.
slimmed down prep for ghast hunt