We cherry-picked this bug 2023103.