This is a follow up to #135744.
This is a follow up to #135744.