Please don't, adding more dependencies to things we want to remove moves later further!