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

This reverts commit d0e1986dfb69757ca5ca62b09a597403f76c28d1, reversing
changes made to 3836d98e6d761166151ca353ec2b90fa6ff3313e.