Autointegrate new dependencies
Revert "Autointegrate new dependencies"

This reverts commit 8c2c106e00cc983e5dd61ff2cb0fa10162dcddb1.