Back out most of v1.47 changes which mess up the block size on these reads. ok deraadt@ guenther@
Back out most of v1.47 changes which mess up the block size on these
reads.
ok deraadt@ guenther@

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