Issue #2525870 by pwolanin, willzyx, Fabianx: Regression: machine name inputs no longer work properly after #2508735