Rejigging how some dependencies are aquired