Followup to 5f39f15