Hi Greg, Couldn't you have used the first implementation you had to restore the feature bits? Also, you need to make sure this reverts when the output is text, too (so after dumping raw text), and get a test to check for it. http://llvm-reviews.chandlerc.com/D2255