Don't always skip auto-undoing entity changes