BZ 1089062 - get this to work on Solaris
(cherry picked from commit a776bf09e485b31dfdc2fc305efbc7ae08416cec)