[BENTO-82] Import same fix from PR#72 to i386 box.

i386 gets no love!