Reverting dependency experiment on core.