Back out local_settings changes for now

Make it safe to merge this without requiring changes in the
server code yet.