Workaround for https://www.illumos.org/issues/3880 should not be necessary now