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

This reverts commit 6c602c615161d9b8b2d7cc42ab4de6709a135ada, reversing
changes made to deeafa193ef6b1e035e543b3d68bf3bf49808f4b.