Revert r270120 (partial), r270122:
  Restore ABI compatibility with 10.0-RELEASE.

Requested by:	many
Reviewed by:	delphij, ache
Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation