Revert "Dear maintainers of evita, falcon, honami, and nicki..."

Evita - fixed
Ville - Fixed
Falcon - Fixed
Nicki - Pending testing, builds
Honami - Pending testing, but builds

And all before lunch.

PS-2  All shit is fixed.  So far all testers reporting stable builds

This reverts commit 5d87a5d800c5d6f2a760fe31cdefd42190990663.

Change-Id: I855b7c977bf6ba5fbbf52251b07f33f4c80e01bd
Signed-off-by: DHOMD <DHO@dho.im>