Revert "Add serviceutils to distribution"