messed up dependencies

it's a crapshhot
Revert "messed up dependencies"

This reverts commit efbe28718ce959159877855d4bae8c9aefcad0b2.