One more try at fixing the template .zip cleanup.