Revert "Relaxed dependencies"

This reverts commit 0be46c2f439a06454349265fc1a7f6978cc220b1.