Rollback some changes