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

This reverts commit f759987fd81bdd59a797d3150d0a5a2225a06538, reversing
changes made to 23a2dcc060525bfbdc1c0a353d56d9281278c20d.