Re-consider specific use of dependencies from *.cp

See !28 (comment 89768)

We may need to revert or otherwise tweak what that does.