This is a tweak to my 8ec11bb change I a-little-too-hastily committed. Change-Id: Ibeee9382109994c66227d1c42aac749e2a274ed7