Make EntityTameable Stop Attacking

[gokiburi]

I've subscribed to the Player.EntityInteractEvent so that when a Player clicks their tamed pet it stops it from attacking its target.

 

Unfortunately, using all of the below, it still remembers its enemy/victim (mobs/neutrals) after telling it to stand up again.

 

tameable.setTarget((Entity)null);
tameable.setRevengeTarget((EntityLiving)null);
tameable.setLastAttackingEntity((Entity)null);
tameable.setPathToEntity((PathEntity)null);
tameable.setAttackTarget((EntityLiving)null);

 

Is there a working method to force an entity to completely forget about attacking something before it kills it to death?