Simplify equivalence resolution fix

2 jobs for master in 2 minutes and 50 seconds (queued for 9 seconds)