Revert "Merge branch 'master' of"

This reverts commit e32976423943d52b38822fe015fcbf5176087048, reversing
changes made to 203011a6b2ee15b4c3575b5ae56603a0a186c135.