Revert ad608e9..8ed45c9

This rolls back to commit ad608e9bfda8cb4e1b6fdeb4dc4ca45f13b1825c.
This is probably going to break anything
One more maybe