Split saveStore into client and server versions.

And yet another ugly flag was destroyed.