This reverts commit 41c662dc. The update doesn't compile in i686, and I don't have time to investigate at the moment.