Revert r270120 (partial), r270122: Restore ABI compatibility with 10.0-RELEASE.Requested by: manyReviewed by: delphij, acheApproved by: re (implicit)Sponsored by: The FreeBSD Foundation