mehdi_amini added a comment. When did we stop using the "old" form? We don't need to preserve an auto-upgrade forever, as long as we can simply drop metadata for old bitcodes this is as valid alternative. https://reviews.llvm.org/D26438