We cherry-picked this in bug 2059127.