Don't rename system when migrating from 9.x -> 9.4

Closes #35525 and #36148

See merge request !13228