Revert "Merge remote-tracking branch 'origin/merge2' into merge1"

This reverts commit 4e4fc914fc98dbc1a909e35c2becee6d16082069, reversing
changes made to d1fb1409126088d1767980f1bcc89d82c0a86664.