Flag remote servers correctly so that they're properly handled on removal