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

This reverts commit 04caf9390b4baee0fcb1aa1e0b9dd5ea87402948, reversing
changes made to 20d38bd9df7badc53ec10dbbdcf783b77c768f8b.