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

This reverts commit eb7115fff9b8c208a40f08ad7c6a248868b145ff, reversing
changes made to b88de7f5f0e7c2813858ee956ce853880068ace2.