# cherry-picked from upstream