Backpatch from a2ebece503 (field padding)