REVERT: Move bootrec-device to root of recovery