Revert "Merge branch 'master' into gh-pages"

This reverts commit 199e606c4d83014457c4987621ca250f1d53eedd, reversing
changes made to ed59c40011d119a039cc70bcd9419a62e5150127.