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

This reverts commit 4d63da4fe1ced3fd956e0ddf60e1b1f4b2fa14a5, reversing
changes made to 69bac6a745c7b1dc5df751dd0b7b98e36e21b44d.