Revert "Merge remote-tracking branch 'origin/master' into Morozova_UI"

This reverts commit 0237e528d8ccfb3704fe210b1eed60eb15757dce, reversing
changes made to c6130d278c6908ead0a7494d42bd650edeb64d73.