Not a bad idea.  Let's do that in a separate commit to synchronize the change to the server and client.