Revert "Drain was killing nodes, causing the stop call to error"

This reverts commit 8e767d6cbfe61d373d9fa2902b279b6b2773eae6.