Revert "Merge branch 'test-2' into test-1"

This reverts commit 95690dab73d96063a0ff290415ceec636496fa74, reversing
changes made to 5ba4e5f68d515eaa8b0de9a9152a8d7010d9b340.