Pull out the dependency-support for now.