REL-2127: grim target selection bug fix

Same awesome PR as bugfix/REL-2127, without crippling merge conflicts.