45443b4290
This reverts commit 08fddee033.
The change caused performance regressions in some cases and performance
was not consistent across engines.