Revert workaround in commit 2caa47af9ff696353a1780e735b68cfa6e0e8b23 when it is patched by llvm see issue #1038