Hmmm, should this be a conditional dependency instead?