Revert "Fix an evaluation errors cause by a dot in the machine name."

This reverts commit 98bd33179c932bbbc354224099971122a8a15627.
Revert "Fix another evaluation errors caused by a dot in the machine name."

This reverts commit f7a9558e4add6b5db361c508ce7a55ad0d10ddd0.