A little ugliness is accepted to keep the binary file format
compatible.  No functional change yet.

llvm-svn: 84020