This reverts commit 9123d4df. Breaks KMI, should not have merged Change-Id: I957881d95f583e02563e93934be3e74cbf2c87a9