restore defaultContainer for now, but deprecate it