Since we're backporting some dbcheck tickets early/out of order to older versions , there's some code we can't fully backport yet that are commented out (mainly 7.0, 6.0, 5.0, but we should check 8.0 and 7.3 as well). This ticket is to serve as a TODO ticket to make sure that code is uncommented out at the end of the full backporting process.