Oleg's commit
Revert "Oleg's commit"

This reverts commit b807c31f7d5ae152105edeb011cc3464954d6106.