Reverted padding changes