Upgrade scandal to fix replacing across devices