Revert "Merge remote-tracking branch 'upstream/gh-pages' into gh-pages"

This reverts commit 5b55ff178d3ca5243b601cb42c3d5ff372cedaf0, reversing
changes made to d9d786659994e9d690da4d3c6b2a00a4893d9b35.