Revert "Fixed bug with NBD server timing out and dying"

This reverts commit 89597aa88846d3719870cd43caa0b615a3bf6aee.
Revert "Revert "Fixed bug with NBD server timing out and dying""

This reverts commit 0c698c988aa771f5174b0db8d83c900478d769ea.