Jumped the gun with r202551 and broke some bots that weren't yet C++11ified.

Reverting until the C++11 switch is complete.