This reverts commit 7f6e518e. Breaks KMI, should not have merged Change-Id: I23d7a9d9d9506a98c916c22a6e3b9fbe38b914c7