Lots of reverting

This reverts commit 17075c3c59d958652bea2e4f9f153647e252d47d.