Merge "Getting rid of Dependency.get"