Revert "simplify squaredNorm"

Rasmus Munk Larsenrequested to merge
revert-fb5bb3e9 into master

This causes some subtle alignment-related bugs, which @chuckyschluz is currently investigating.

Merge request reports