Revert "Added support for ${MachineName} variable in environment-specific paths."

This reverts commit b6151a997f03ddd1a13f4d063bf4b8c0217ceef2.