Revert "Merge remote-tracking branch 'origin/project/GDA-5479' into 8.34"

This reverts commit 5134e7a2cf15e520322d36dbe35861c3d3c031e5, reversing
changes made to 6d4b3e16fbfedc8cff4df5a5e0c13c6235d248e4.