Revert "Fix for hanging test processes on dev1."

This reverts commit 52531bd20aa3a02d9df13e178f6059fe87fb3037.

This is causing failures in Cross Version tests - reverting this for now.

+review REVIEW-5232