This reverts commit 25a519ecca. Due to regressions, we need to find another fix for the original issue.
25a519ecca