That would be fine. I'd still be OK with keeping it on both server and client, though, even if we don't use it on the server today.