Followup fixme on r80861,