Revert "merge upstream"

This reverts commit fe5c6db1f53dd0b11ada8dcff8b963388092061e, reversing
changes made to 299a940ba14b1c6cdc43c64596ce924146a0e2de.