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

This reverts commit 3f1ce9c55cb9cc5fcd3a95d972bfc306b95b6f02, reversing
changes made to f39a21c7579e231371953644b7ffdb5bf485b88b.