Revert (for now) npn token limiting