Go back to handling EOF the real way