SYNC-1243

Much cleaner than my original PR