Bug  985389 - Remove lazy getters from import services