Revert "Merge pull request #2007 from ibuclaw/cppmangle"

This reverts commit 60dee0bde7db72c84a99b18a911ad14e5bf88db9, reversing
changes made to ad0679d1a7676f694b016b10ed8ae927c08282ae.