Merge change Ia4eedace into eclair

* changes:
  Now that UseBuffer on this component is fixed, let's use it.