I'll commit this patch immediately to see how the build bots like the change. I'll apply any reviewer suggestions in a second commit (or after any necessary reversions). http://llvm-reviews.chandlerc.com/D423