Revert to algebraic for x64