Undo the circular buffer changes introduced by the master->dev merge
Merge pull request #238 from mozilla-services/undo_cbuf_merge

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