Revert "Unrelated issues. Partial revert"

This reverts commit 219dbe6f9b837a1cb66a71d6aca24f93ea0d4372.