Please review: https://code.illumos.org/c/illumos-gate/+/3607