Drop extra normalization definitions
(cherry picked from commit 58d66470e23d46498d93630898592cab3bc3c432)