Merge pull request #9424 from Pokechu22/sw-no-special-case Software: Remove normalization special case
