Fix Linux 3.4.95 merge derp