To be clear I think they should have left everything as is. But the arbitrary manner that guard operates is very goofy.
Taking away a 2h tanks chance to defend is probably too drastic for most people to handle from a gameplay perspective. But it would make a tank with a shield a better guard and it would make guard less of a thoughtless ability.
I think it's a good idea, but I dont think it's a realistic idea. I don't really care what anyone thinks of it as most peoples opinions mean almost nothing to me.