BZ-9746: commenting out non-compliant code to get past build break