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

This reverts commit 8425f516b2d2c3c9319598aeb7c36749e1fae5c0, reversing
changes made to 18cb10b69056e7798ef974194eceedf7c350f7d3.