Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 044d96deca0cb70bf9001c4c47fda0dcabc6e8e3, reversing
changes made to 1af038173fcfe04eb23b84adf7ad04e9cf0c0915.