Ported oldDeps back. + fixes issues with prev commit.