Redo deletion of some serverinfo code that was mistakenly reinstated