Fix derp before initial merge

Change-Id: I46289bb6077693ac1264de35545d6e5fd91709f6