Merge #12417 followup, also removing an extra docstring