Revert "Adjustments after merging branches"

This reverts commit 2623c0154990d41a96c431b1e56c09a36f4bb055.