Finally found a shield merc who would one-tap me pre-patch. That's what he does to me now.