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

This reverts commit 065898a0e7549bbc090cd0313ed68ee75b7d64d1, reversing
changes made to 99aca6ba44417b1ce6df252dc1809f496d7cc630.