Revert "revise_norm"

This reverts commit 027ccb0aed330bef60c3c1acd32144c48f7b2425.