Revert "some tweaks to make adaptive moments converge properly for flattened objects"

This reverts commit ac4ce836299153982270d4c473032beb216da756.

Conflicts:
	src/hsm/PSFCorr.cpp