If we're adding server_id here, then it should be added to the docstring along with revision.