Add workaround for Doctrine problem with superfluous changeset calculation on remove