restore commented code. SAME CHANGES MUST BE COMMITED TO ANOTHER BRANCHES!!!