Revert 6079fb8..19abf08

This rolls back to commit 6079fb823f4e9c2044a7b242bd4146f68930bbbb.
glitch death in the nether, won't go away :(