[Bug 186074] Optimize for i686