Partially revert move of std::tuple_element_t to <tuple>