reverted c++ changes, which do not display nicely on other machines