revert 10e43e5bb: fail-path does not work with it, which makes diagnosing unify fails difficult