Add hunk missing from changeset 9a2cea1ca678, r+a=bustage