Revert "Merge pull request #5001 from ovcharenko/devel"

This reverts commit d6c3103a0049a3da3b2f531ff075cc4485b2f4bc, reversing
changes made to b11f96eaa47515ef0ab18e73e13e8ce5c8b79b82.