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

This reverts commit 2ac4e3724e02d3b76ca058e65f9d47fdc9f043d5, reversing
changes made to 174421e5d3d681327094175b76c6fa34e45b278f.