Resolve circular dependency

Signed-off-by: Damien Le Berrigaud <damien@pivotallabs.com>