Fix over-decontainerization.