Revert "Patch to fix test_rebuild_volume_backed_server"

This reverts commit f0fd5a98d65526f823bf176377ee2059a22142bb.

Reason for revert: merged by mistake

Related-prod: PRODX-43715
Change-Id: I1f1f7ba05f9805db5b91b185ba2f961e109c9299
2 files changed