libsrtp: partially revert previous commit