This MR is a follow-up to !84930 (merged). It restores non-DPHI eTAU items with MATCHA.
CC: @mdyndal @shanisch @lshi