Leaving x86 branch in a buildable state