Revert "Merge branch 'develop' into release/2.11"

This reverts commit 4c0477408eab2b2780168eafc7b30844af894309, reversing
changes made to 71ee1d00d08953bf27ba0d87e9c911c2d6a049ba.