Fix broken dependencies by reverting the previous optimisation.