Bug 1062016 - Editing state gets out of sync. r=yzen