Revert "Merge branch 'origin/master'"

This reverts commit 9ba99e5b284bfc2c074a96918401dfd82f4c9868, reversing
changes made to 64e1105f0149e25daaf0dbf96025f1fa34e1ba33.