Follow-up per r80813 CR