Yuri, can you delete the line instead of commenting it out. If you are sure about this change, then we don't need to carry around the commented history.