Revert "Merge branch 'change-1' into release-1"

This reverts commit 11b253e0037f5bac918ad12c57d0d038b74a86d4, reversing
changes made to fd00daf319e962649641d5249995ea26ad35e997.