I stopped using iCloud for just that reason and now with Tahoe.