Remove duplication of stream reader creation, to make sure everything using the right encoding