Revert last Bob/C++ change