Rolling back change induced because of 'clang-analizer' report.