Revert 9351d3d..12b27ee

This rolls back to commit 9351d3d1e43c7ed4a416507af9e5f3210062136f.
working but oh so dirty