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

This reverts commit e4ef029bd042ff11b2d7b986ea854e4d5e300459, reversing
changes made to c9a033ae1516c250945d91c3c7d752cfb806a68a.