v.g.vassilev added a comment. @rtrieu, your comment was along the lines of what I was thinking of. I have updated the patch. Without testing it on large scale, I the current change seems to work for us. https://reviews.llvm.org/D48524