Move version translation over to happen sooner