Fix to the #1639 fix

Had "uname" from GNU coreutils in my default PATH on Solaris boxes. Previous fix was not correct.