For ENG-6702, fix failure in the memcheck build