Re #10814. Bringing back old checking code.
Merge remote-tracking branch 'origin/bugfix/10814_failing_builds'