Revert "Merge branch 'bugfix-11928' into release-6.6.3"

This reverts commit 1251deaf9027072ecadad1610d99e7b5ddf30bbf, reversing
changes made to 3a5a533e81f91db23468a26f95e218cbfe03fc90.
Merge remote-tracking branch 'origin/release-6.6.3' into develop