Back out the <type_traits> changes from r198431; they were breaking when building with glibc. Need to find a better solution for PR18218.