This reverts commit 3ca5f6f62e. There were some performance regressions detected. Fixes: #135215, #134941
3ca5f6f62e