Revert "Merge branch 'revert-test'"

This reverts commit 36ce0b5f48ccdd56a982cfc9ed3094458e88f793, reversing
changes made to 92a623186b09c1ae806aca77e9001910ebc76517.
Revert "Revert "Merge branch 'revert-test'""

This reverts commit ead264bc48a9e6f75fa2b53f52b98f29ccc5ae85.