Undo merge that WASN'T ready to be done YET!

Revert #286