BZ-12444 removed mismerged code