Revert "hacks to build on SmartOS" so our master can mimic
original upstream source.

This reverts commit 7a1b7fa32ee2c54a3b420bb6dfefec7d3ef57c16.