Work towards making !61689 (merged) pass. This time fixing MET association.
/cc @tstreble @tbold @fwinkl @schaarsc @mswiatlo