Grenade cancel without holstering

Could we please get a function to cancel a grenade throw without needing to holster or switch to a gun? It feels clunky when you just want to re position a little and still want the grenade out but you need to re select it first. The current state also severely limits the viable locations that holster can be rebound to. For example if you rebind holster to scroll wheel click it is difficult to click while readying a grenade throw with left click held down. 

I think right click to cancel throw would be the most natural choice.