Use relative import now that it is required. (Should this go into 2.5?)