(cherry picked from commit bad2db31) Forward-picked from staging to staging-next; it's a trivial patch and we now rebuild anyway due to unzip.