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

This reverts commit 3aa6a6dff990e1053a7e03dcc036b51c57a152c5, reversing
changes made to b6b93987188640667c54b078df07d4b642090e2e.