add back some dropped utils client needs