OP-1290 uncommented accidentally commented lines