I'm not sure whether we need the old client in the ember branch at all!?