Backpedal re issue #79, bring back conditional dependence on new containers