Revert "use nested deps"

This reverts commit 23b70186aef4ddf6c0acee18ddc85f050dce4854.