Revert "Made changes for nonroot daemons run"

This reverts commit ebae6da01e08bce63282a543c7dfd5434cf299f6