Make this compile again in this temporary branch

Change-Id: If025170ce850d23036df37106c3d8d5a8f6fd076