Revert "Fix miscelaneous compile failures for sunCC"

This reverts commit fef5e64031e1e2834be468df3ec4eacf2b0fc9c9.
Merge topic 'misc-sunCC-fixes' into next

5fa190ac Revert "Fix miscelaneous compile failures for sunCC"