This import is ugly :-) Should we quickly make this function public?