[unsafe-to-break] Simplify logic

Always use the algorithm for non-monotone case.  It's more robust.