Revert "upstream changes"

This reverts commit db8c75eda0a115102694cc4b02dc7bccc1384027.