Thank you @Phuturist , going to test for my few devices.
ALL - just might this script come handy : [HOW-TO][Pro][Cloud] - Tool to FIX (advanced) flows after removing and re-adding devices
It’s fantastic life saver in such situations. My advice - mark down the old device IDs before doing any repairs. 
