Revert "opcontrol: fix isoc++11 compatibility (synergye)"

This reverts commit 40f729fdf32dd7de553ca264b6a3105cca663803.