move the x86-32 part of PR2108 here.