Remove CrossVersion.fill as mentioned on IRC the other day.