Follow up to edit the changeset - TRUNK-4239

Follow up