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

This reverts commit 6fed38145e5b138420f1e0b6ead55b66f347299d, reversing
changes made to a267770ebd7724d6b497d309eb4bb0b25e828dd9.