Revert "Merge branch 'patch'"

This reverts commit 9edec593eda9a7ddbb08823a8fd1afc20787cfdc, reversing
changes made to f52082f4208a04497908eddc45e21e364bb2537d.