Revert "Solaris11 warning"

This reverts commit eb2e8155c6b97188e4414f77f84cb38260657d7b.