Merge change 24947 into eclair

* changes:
  make sure to update the tail pointer when undoing a dequeue