Follow-up for r217020: actually commit the fix for PR20800,