Revert "Merge branch 'bugfix-11068' into develop"

This reverts commit 6d349339562c9b7285fb14d2b0daab6b1c5daa70, reversing
changes made to d586ad51d6232f0d07dde8307e901920d8eff6ee.