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

This reverts commit 9f4b75e11417fbaa8808cf0da4c1dbe3f02d0978, reversing
changes made to 4a699af42b9a9d98d273ae1c5b00d2dbc86b21dc.