Reapply r233175 and r233183: float2int.