Fix derp in last merge

Change-Id: I79421b0fff64546f92b96b4940d27b7bc0288c3f