Revert "Remove dependencies, per similar change in client."

This reverts commit 8ee4a6c2ffa9a129a56490757995f77371191543.

This breaks stuff! :(