Revert "Upgrade scandal to fix issues with renaming across devices"

This reverts commit f555af0b8831f390fa893ee2690f77197ba80503.