Build fix: back to C++98

Change-Id: I5aa74c17f3274a130f76a25fc7bbb184b3f5c69b