This reverts commit 18374ea8f1.
18374ea8f1
we'll have to switch to the clang C++ api anyway we'll revive this code later