Merge from RTCP branch
Revert "Merge from RTCP branch"

This reverts commit efc2f79dcea30f94ebc62f0720e4e98f472873a8.
Merge from RTCP branch
Workaround merge disaster