More tweaking...

Change-Id: I9276fd92a90dc2689bd59b2ed7eef3d7267ff5b8