revert c++11 specific code since nao compiler 4.5.3 does not support