This reverts commit f4e36db5. Breaks KMI, should not have merged Change-Id: I30a885047459a39c487e8a070ea160b26d03e2fb