We cherry-picked this in bug 2029428.