Import same fix from PR#72 to i386 box. i386 gets no love!
Merge pull request #77 from juliandunn/BENTO-82-i386-fix

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