Undo work on transitive dependencies
Undo test changes