FS-5737 revert
FS-5737 reapply
FS-4757 this should fix it but I am not happy with the way this is done but since polycom is one of the only phones that does this right I have no other choice