revert api-fix stuff and update core