Followup to r82739 (bug 27688)