Revert "Merge remote-tracking branch 'refs/remotes/origin/test'"

This reverts commit 30bca9ca3af9aa1ddedf57f23e7f42c0bdd9d28b, reversing
changes made to 51e19e48cc8b241f8dccb15b3a84213b2153f7b8.