Don't remove the container= environment variable.

See #1020.