Update 2nd time lucky

Change-Id: I5a30d042c521fcb5bdcc59976a59e72794cc9b00