fix dependency explosion

Signed-off-by: Sheel Choksi <sheelc@pivotallabs.com>