Branch revert-3508-packingStructure

Full project name: coreos-assembler/revert-3508-packingStructure