Revert "Issue #24224:normalize margin calculations"

Reverts xtuple/qt-client#421