This reverts commit 1dba6b37. Reverting because the ClangReplInterpreterExceptionTests test fails on our builders with this patch.