First pass at backporting to allow use on i386.