Log Message:
Deploy a gross hack to make this buildable on -current and maybe -6.

XXX: This should be reverted and done a different way, or maybe not at all;
XXX: this package should probably be reviewed for soundness.