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

This reverts commit e6ec5907556ead3697d1b3a19f7591c3736d3b12, reversing
changes made to b36ea4e4ed6193e893bc27d81c601ba2af295223.