This reverts commit 6e58cc8f.

This was freezing some processes on test nodes. I revert during
bug investigation.