follow-up to I1ec8d99da9e74966425e4505340205413b37718e

Change-Id: Ic54d9675119d622a364c8855ec0fabfdcf924127