norm2
Revert "norm2"

This reverts commit 04da613fc8fea1e02c38dcb0f88deb3bd289f230.
Merge remote-tracking branch 'origin/master'