revert prior to cpp fix
attempt #2 at fixing solaris