Revert "Merge branch 'test'"

This reverts commit 46cf9d896df3271bfc6ba25c877ac1a73afe7fa7, reversing
changes made to d2472a1fa4b143e7606b298c0d3e92f48b312697.
Bump.