Revert last commit

Breaks other stuff.