Think these changes got lost in a merge, causing the sync worker to crash hard