Revert "Merge pull request #1317 from pullreq/cpp"

This reverts commit 74135c0600d5dcc40d396d0e7293c17b8d4bdaa7, reversing
changes made to 6d749789ce240a3e6f1447777db63fd8e7525560.

See discussion in #1317