21.9: move once more back to AMVF as ITk default
Following !31364 (merged), we were able to ascertain that the AMVF is correlated with a large jump in CPU for eflow in Phase 2 reco. Nevertheless we'd like to use this as the ITk default, and understand directly why the eflow has problems with it and solve them there, as seen in !31624 (merged).