The House today passed a FISA bill with some bad aspects, but without the immunity clause. See the EFF press release.
While there's stuff not to like in this bill, all of it can be repealed at some later date — except the immunity, which would not be subject to repeal.
Florida's Senator Nelson voted wrong last time this came up before the Senate. Any chance he'll do better this time?