Revert "Merge branch 'dev' into CON-1447"

This reverts commit 0eb125467d0cb4549aceb6057984f964e837f895, reversing
changes made to 45b09a63ff86d5a2bdb51950eb8730f42daa5386.