I don't know if the FJ40 tank has baffles or not. I removed the fuel sender float and then tapped on the top of the tank with my hand and the rattle was still there. It does not rattle when I shake the vehicle, just when I'm driving or the engine is idling, or I pound my fist on the tank...