Revert "Fix up dependencies"

This reverts commit 66cabd64bf331771b4b8ae2f0f7dbd874eea6819.