Revert "Merge remote-tracking branch 'origin/dev-BAU-116' into release/2.9.19rc"

This reverts commit 4733064d30bbf813c1b508d66dce8cf005ddeff2, reversing
changes made to b99fc1937ae5483617ed93f2e80febcdfce1db81.