This reverts commit 9423f78240a216e3f38b394a41fe3427dee22c26. A performance regression with this patch has been reported at https://reviews.llvm.org/rG9423f78240a2#990953. Reverting for now.