Note that this will likely need to be folded with the changes file for #12751, as this change is a mere fixup on top of the changes introduced for #12751.
