Revert changes not related to rtp