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

This reverts commit 8230459381515762f5b4e9ea9683526a840f7c6b, reversing
changes made to d2457e89b5df663736cf48279e0cc9a4a38ea455.