Revert "unbreak everything" (it actually broke everything)

This reverts commit 6ac88bd610e5615b59258c8bb60293b42744bb67.
explicitly subclass BinaryParseStream