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

This reverts commit 8ba0c1ebcd0744457a889e909de483dec5fafc2a, reversing
changes made to 6d943e3c8562a0b020321057e7892269b38fc853.