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

This reverts commit a09ac181407523bd9642ccb252ee0bc20eb27b80, reversing
changes made to f165bd3550b6eb214d050017d89cb70efc4f9dac.