remove c++11 feature that should not be used in 2.3.x branch