Revert 181475 as the DebugIR tests are breaking (automake) buildbots that re-use...