Backout of 82d2161
Merge pull request #1705 from yurydelendik/back1700

Backout of 82d2161