Revert work around for gcc compilation issue

Revert part of commit a7c76ea. The assertion inside bufferSize() failed.

Fixes guzzle test run failure.