[x86] Revert some changes which seem to cause regressions when compiling fsharp.