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

This reverts commit 80f06e2574e5ee85af46f8e600860432283b5979, reversing
changes made to 987b3f8d709a4736706afd2e6edb3e3217a2780d.