This reverts commit a73ccadad2. Reason for revert: With this change, we are unable to boot v6 devices. Change-Id: I57d2ba2dd693a6c8625ffe46bb170e17b6d6cb84 Signed-off-by: Bruce Levy <quic_blevy@quicinc.com>
a73ccadad2