Revert FS-8565, its getting a few blames for 3cx interop issues, we need to revisit the original reason and make sure this was the right fix.