Fix fallout after a700ce8e2b2f2dad50bf36dfd69de577211f1dc3

Change-Id: I489126d291f9420aa1692d4b1f187f72dfd92a62