This reverts commit 20fd6243, which broke the C++03 build bot. I'll have another stab at this after fixing those failures.