Revert "Re-evaluate the pathmap if there's a recovery variant in play"

This reverts commit 6b21727ef8997762d83691cb453aa950aa8d574b.
roolback

Change-Id: Ib6e0694c6703aab1c4ac8f9a2f3c8444765241b8