Revert 5a4ab39..015ffc9

This rolls back to commit 5a4ab391c2c1038c9363ea43afd64318bf564c2c.
glitch death