OS-2775 Clean up for illumos#4522
Reviewed by: Keith M Wesolowski <wesolows@foobazco.org>