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

This reverts commit 496c47e9a8cbf357530c42ddc90bd67737d0d97f, reversing
changes made to 5e6f63b1b51ac4a1347d548c02146c1e58b6dc40.