Removing C++11 feature