Revert "Issue #24224:normalize margin calculations"

Reverts xtuple/xtuple#1714