Undo merge
Merge pull request #1066 from spumko/issue/1065

Undo merge