Mimic what was done in d19d744 but for Solaris.

Mimic what was done in d19d744 but for Solaris.