Revert to before type_traits addition - linux compilers don't support this yet