Merge pull request #3304 from Mloc/master

Removes Kida
Properly reverts Kida.  (what a mess)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>