Revert "move normalization factors to .SetWeight() calls"

This reverts commit 5a742033db129b7aec244af9b9ed2c10806e0df6.

Revert change because it doesn't work.