Reorder dependencies so that it will compile again