Revert "Improve NaN testing"

This reverts commit 207ab8fe10e0791cb2a9451451b4ca0aa5c7ba1a.
Improve NaN testing