Looks like tests still depends on this. I will fix it.