revert_656
Merge pull request #504 from marknovozhilov/JFG-656_revert

revert_656