Followup to PR 187507, thanks to riggs@