Sync up with libjitsi code to remove pointless differences