Remove duplication of stream reader creation, to make sure everything uses the right encoding (closes #596)