Yeh, it's been a while since I played and I forgot about this, if they really truly feel the need to keep it in the game, at very least have it so it uses your un-used nade, if you've already thrown your 1 nade (or 3 if perk), that's it, no martydom.
Also Head shots should prevent this perk.