Revert cpp usage

cpp locally and cpp in FS do not act the same apparently - and
using them causes more trouble than its worth for the moment.
Should return to this later.