Revert "(issue #3880) use overflow instead of padding"

This reverts commit a74d0b59e532c3d60f07acecff3bb6e6f9eb6452.