[BACKLOG-331] - Reverting changes pending further planning
Merge pull request #264 from brosander/BACKLOG-331-REVERT

[BACKLOG-331] - Reverting changes pending further planning