Build #6613:   fix issue on branch remove_adminserver almost 5 years ago