Revert "Issue #24224:normalize margin calculations"
Merge pull request #1726 from xtuple/revert-1714-24224

Revert "Issue #24224:normalize margin calculations"