Revert "GRAILS-6650 is fixed by the StreamCharBuffer changes (scb-safebuffer branch merged to master)"

This reverts commit eb58077f90ba0529a25156f44ad4c88ceb1ac0f7.