Fixes routes to revert to original state if mapping routes fail. [Finishes #82527600]

Signed-off-by: Frank Kotsianas <frankkotsianas@gmail.com>