Remove Paolo's variant of the algorithm, with his permission.