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

This reverts commit 42ecce0568d3ff72fc44ee439fa1aac5aaf47877, reversing
changes made to 24f293e9f25bb03e3502b31e2776a8752b22f384.