Issue #8: Revert changes