Add a Preference for ServerManaged (and allow clients to exclude Server Managed properties on update) 

https://www.pivotaltracker.com/story/show/80874156
https://www.pivotaltracker.com/story/show/80874184