e924057d80
Fixes an inadvertant change made in a previous patch while doing some experiments. Change-Id: I9961f2157c803676491a3d6daf056ff8a37367b3