
This reverts commit e6e8f6a56231409028ff1e7cdcd44781ca37d5b0. Kilo deprecates these settings, but they still work. We should wait to merge this until upstream distro packages are ready so that master is not broken. Change-Id: Ib05943e89969eb810527943426c566cf4a77e7ad