undo InternalServer/Server distinction, fix rill compile error