Undo the circular buffer changes introduced by the master->dev merge