Revert r272724:
  Features not yet available in stable/10 are needed in
  mkimg(1), and it is more dangerous to tweak these changes
  in stable/10 directly without explicitly testing certain
  failure cases.

  Re-addition of this change is imminent.

Sponsored by:	The FreeBSD Foundation