This reverts commit 59d6e814. The cause for the revert (3 clang tests running opt -ipconstprop) was fixed by removing those lines.