Revert #1205
Merge pull request #1224 from yurydelendik/revert1205

Revert #1205