Revert the discid fix.

This must be handled by an OpenBSD patch still, because upstream will
never accept the changed "sane" default.