Rollback unrelated changes