Revert "[cnchi] Rebase on commit f3605e567bf8fc3000fe2fd7f4ba31ddc5e4f6ea"

This reverts commit 211ea0f96de093202cf9aa271d72ac768c35cda8.

Conflicts:
	Packages/cnchi/PKGBUILD