Revert "sync with upstream"

This reverts commit 54ab88909248202b0efb41d371a1b97264adccce.