This reverts commit 3660248f290b13c98aed7943c2421b7aeb229131.
Testing. Pull request CI jobs fail for some reason, however I can't reproduce issue with local builds. Maybe this will not fail, otherwise will revert this commit.