Revert "Merge pull request #1038 from redstar/solaris"

This reverts commit e0169cf59401505efbfa336e4ca234e40755560f, reversing
changes made to f9b55f723cb2a99a83a9e3937334e7c959f3b52b.