Another rearrangment of the dependencies, in an attempt to get this to build