Revert "Stuff, not quite sure what it is"

This reverts commit 41f3eabe46be52b16cf3b7a375178592b9f64777.