Rolling back brevious commit.

We also depend on reader-error.