Replace normalize

There have been other regressions from removing
normalize. Replacing it until the impact can be
properly assessed.