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

This reverts commit e8fffc9aab14b501e94efbd244de5759fc6387d7, reversing
changes made to fe0c522f91bfa9d75de6bc1cce39bfc075847097.