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

This reverts commit f7185d1a4c4f31274704e3f7d28cac7565e95465, reversing
changes made to c8569c63d9d204b15ed0974edb53d2cc04bd2476.