Undo previous commit after debating a few corner cases with gwk.  This needs to be redone in another way.
Undo previous commit after debating a few corner cases with gwk.  This
needs to be redone in another way.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars