Revert "Pull dependency wirings out of deps"

This reverts commit bb33eda40f9afa48c6fbc0c7b4224cf16954e62c.
Revert centralization of annotations since annotations can be overriden at test time