This reverts commit 96eafbd792. 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: Ifa7782c6f2a9fc8a50e7724d6f5d7d2414c83690
96eafbd792