readd some x86 things we thought were unneeded but prevented building