This cherry-pick commit ee00df57.
Because this was previously reverted, FLEXISIP-71
See BC/public/external/sofia-sip!23 (merged)