Repair mangled MANIFESTS that got refactored incorrectly