Revert 0924268..0838e0d

This rolls back to commit 0924268ee124f6cc1c0efec39677f2b4701c2364.
working before refactor