This is a risky change that will cause regressions.  If you look at line 565 of the same file, this change will cause a null ref exception that wouldn't have existed before when the name does not contain a slot.

We need a more targeted fix rather than this fix in common code.