Safari 8.0.4 windows not reopened
I had to sign out of iCloud on my Mac because iCloud Drive stopped syncing. Not sure if this is a coincidence, but after signing back in to iCloud Safari stopped saving open windows when I quit and relaunch. I updated to Safari 8.0.4 but that didn't help. I also deleted the Safari folder in ~/Library and replaced it with a backup but that didn't help either.
System Prefs/General has "close windows when quitting an app" disabled (and other apps are saving their windows.)
Any other ideas?
Mac Pro, OS X Yosemite (10.10)