Revert "Merge branch '2.x'"

This reverts commit 0b73c93e619efcb6caa5b0526350e47ce8893a0c, reversing
changes made to cc5a169c70c471202783f1afc47d0a3ea63e548f.