Moving to  module instead of cutomer buffer concatenation.

I actually don't know when this originally came from.