Properly reverts Kida.  (what a mess)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
Merge pull request #3305 from Mloc/master

Properly reverts Kida.