Remanifested and repaired the deps problem between the two packages