Revert part of that merge request that was causing a crash of the DQ validation code, hopefuly this will fix the problem reported on ATR-21903