Moving back to the original machine name so substitution works.