Undo changes not part of c++11 change.