Revert "upstream"

This reverts commit e3144f2ce3ea0bb93219281e4430c781eb031e6a.