Incidentally the new one takes far less time, especially on Octave.

(cherry picked from commit 9c3ce035)