Revert "Merge branch 'test'"

This reverts commit 21c5737c4cae034e7b8ad363ac71e020dc345fd0, reversing
changes made to 8a24a5ed28c4b4c74f2e32a9c31c5599eff36ae7.