Remove an optimization that made things wrong.
Remove bogus decontainerization.