SYMPHONY-1632
Slight change to simplify zip usage.