Don't need our own ArtifactStore anymore either now that the upstream one works