We cherry-picked this bug 2027501.