Revert "Change the substream implementation in pb_decode."