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

This reverts commit 33734c7a9faaa5f9a1cbdd013f1299b122cd7312, reversing
changes made to 0fecb8a4ff1d2f3b73e66456bf9831c9d45a4792.