Help cure Lokesh's OCD

Change-Id: I2e4444d95657145ebfb25750975ed1c4ce3cfd14