Fix Linux 3.4.95 merge derp

Change-Id: I0bf7dc49df4b78fc45fd6ecb7432439ab7b14274