back out previous back out, and this time don't forget to include the NumTraits.h file in the commit ;)