Removing a C++11'ism to also fix the build bots.