[BACKLOG-331] - Reverting changes pending further planning