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

This reverts commit 6e42347c5857fd5ba041d8f44e123b5896dcc883, reversing
changes made to ab92f27f9ae4dc34d0de4a7b1951566446444ad4.