We cherry-picked this commit in bug 1832770