Revert "upstream"

This reverts commit 48009c79421673f6890e7e6207acae71492f2c36.