This reverts commit 934c573b. We had to revert dependencies of this patch due to test failures on Linux: ``` 4909814c ef3febad ```