Followup to af6c67c7.