Fixes servers deletion

Change-Id: I1a74009b07eab6caff4a733f518c7f0ad80ce5d5
Closes-bug: #1248198