UC-2192:  Reverting back accidental changes in daemon.cpp