Try to simplify changeset to make debugging easier