Bug 15895: Remove useless discard_changes calls