Revert "One more part of adjustments"

This reverts commit 1b857ca0299415784715f928a08aa82476a8d191.