Fixes #5644: We can't search for "Name =" for an environment variable na...