Revert "Merge remote-tracking branch 'origin/2.0' into 2.0"

This reverts commit b6fbee2f8c5f740ea393e2cf445555e57e08116a, reversing
changes made to 7e2b0fd5841f20e9226e86980fbc572b3f47f2dc.