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

Revert "Issue #24224:normalize margin calculations"