[REVERT] of revision 3746 because it caused in bug of high priority