Followup: 42be04898c6fd001160ee4fdf00fc2ba5c5c1ee3 (cherry picked from commit dec75903cf2ac3bf62d83300a7526cb44ae5b128)