Revert "Merge branch 'origin/master'"

This reverts commit 1ba2b40c5174c45e2c01b5d837488bae7772b795, reversing
changes made to 227775242cca83d8c6a3f826d6dd5fc3299d2b59.