Revert "superenv: fix cpp shim"

This reverts commit dca89db55189a34f1c02d3f12a84eda8d81fd6d1.