[Users] editing header multiple times

[zm23]

Hi all,
     I am having some issues with editing remote party header.  I  
understand that changes are saved as a diff and are sent when packet  
goes on wire.   In my current config rpid is edited when invite is  
received and it seems to work fine.

There is one scenario where I need to edit rpid or remove rpid  
altogether before relaying it.  "remove_hf" did not remove the header  
after it was edited earlier.

Is there a way to do this?

Thanks in advance for your help.

-- 
Zahid