Yeah, it's a bit odd that Obsidian didn't consider this. It certainly messes with tactics in a horrible way.
I wouldn't hold my breath for it changing any time soon, though. That code seems to be entangled with the engagement code in an unfortunate; fixing it is likely not as simple as it sounds.