Backed out changeset: 35b2d9e774c8

This patch disrupted CBR runs where we were unable to
hit the target bitrate. It is logically correct, but likely
incomplete.
Merge with stable