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

[BACKLOG-331] - Reverting changes pending further planning