Revert "Merge branch 'refs/heads/master' into gh-pages"

This reverts commit 0ed682aca037e1fb1b6fd462d87f8ac48a53283b, reversing
changes made to 83c653194020f63c28bfffdc98ebfa0116fd55f1.