Patch misuse of apply_manifest_on