Rollback some changes...