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

This reverts commit b484c32496a7c0e4f143c02c0ac0d36f54dd6306, reversing
changes made to 9cd28aab85c05d8bfde5631341a6d8b6c4e214a2.