Revert from GetBufferedInputStream to InputStream.

Rewind issues appear to require a more complex implementation.