Merge "Move back to C++98."