Follow up to fix faulty changeset