Revert commit 58a6290

Lets do this properly!