Now that both USE_GCC and -CURRENT default to C++14 there's little reason to complicate maintenance. Revert r449685 to usher consumers into post-C++11 world. PR: 222433 222434 222435