This reverts commit 90532f5e3c. The commit contains references to minErr that are not available in the stable branch.
90532f5e3c