Machete heavy attack spam while blocking not working properly (nerfed?)

[Bracket_Man]

Rapidly pressing heavy attack button while SWITCHED (important) to melee and blocking used to only do the the first part of the heavy attack and cancel the second. 
The change happened probably due to the holster changes.
Current Behavior: Spamming heavy attack while blocking always does both parts of the heavy attack combo
Expected Behavior: Spamming heavy attack while blocking does the spin part of the heavy attack and cancels the second part
Reproduction: Load into mission hold change weapon button to switch to melee weapon, block and spam heavy attack button
Additional info: The old behavior can be seen here: