Revert "#1188 Added C++ guards, but commented out"

This reverts commit ce36093dc36a57123130c7dd0733a4a5a4b889d1.