Best thing to do is n9qtweaks 'save debs' always ON, and backup partitions using ubiboot - i have tens of those snapshots/backups to revert to, no flashing necessary.

Though, maybe this MS decision kills nokia maps and drive apps, they needed an active nokia account to function as i remember.(?)