This reverts commit aa0e7ec7. Breaks KMI, should not have been merged Change-Id: I2ac15184b9a4819131a247a3cabe9d819f3ff1fa