Revert "Revert 799d83db85a43765af65e1aaf4aa42f84fa09b9d partially"

This reverts commit ca1c515da9b1b2cdeca659ba920e64280dea0d51.

It was zip...