Revert "Merge branch '2.1' into 2.2"

This reverts commit 16fe24095e114f60baa54a0a1282f7b95f062d81, reversing
changes made to 0134ed02e47cfaca6490cf52f2c3501b911ab021.