revert [273bbe926d]:  it doesn't work on i386