Fix regression that has been introduced in r524227

Revert part of the patch that introduced the --try-broken option, it
caused problems in combination with -m.

Submitted by: Rudolf Cejka (cejkar at fit.vutbr.cz)
Approved by: antoine (implicit)