Revert most of the 2014-07-28 change involving 32/64 bit Windows
version identification, leaving only the OS string definition.