Try harder to fix ARM/Linux after r219040.