It'd be good to include an explanation (in a comment and/or the commit message) as to why this is necessary and untested in-tree so when someone comes back to this they don't remove it for being unnecessary. http://reviews.llvm.org/D4281