Revert r255853 pending fixes to build errors in usr.bin/kdump

Approved by:	re (implicit)