Follow up to fix failing changeset - TRUNK-4125