Reverts changes so production is useable

* Moving to branch