ENG-4880: Roll back proper null and NaN behavior because it gives different answers for different configs. Sigh.