Revert "Merge branch 'release'"

This reverts commit fc242ea23e24b6a5c2b9d7813e7f57f8db33e650, reversing
changes made to 69fd063d95d879ff5797f3a9b618bff0253699c6.