Changed so we don't depend on IOUtils