Revert "lessening the dependency constraints"

This reverts commit af1d4c6a56befd8053cceb2adf894c0fdfa5b094.
Visibly not as simple a change as that. Need more work.