Stupid changes that I did not really think through.
Revert 0078464..e636151

This rolls back to commit 007846469f4825d8b01354d062feb2907fb7698e.