Revert "Fix for hanging daemon processes on dev1."

This reverts commit e67cbf5f00cc8d8fe31c8b0d0586fd2db0c52739.

Experiencing more issues on the build server that I can't reproduce locally.  Reverting for now.

+reveiw REVIEW-5232