This reverts commit b861bf8ddff67703, because according to @mdorman [1] this change rendered his NixOS systems unbootable, and we probably don't want that. [1] b861bf8ddf (commitcomment-16058598)
b861bf8ddf (commitcomment-16058598)