Fix the build, again

Change-Id: Ib3586cd90d6a82a8b8b59ab11cbe14bb5f770802