Changing to plist-with-patches