This reverts commit b3cffde5559c4fa97625512d7ec41a674be26076 due to a regression and performance concerns. Backport of 5cc81cd9eb69f5f7a711412c02039b435c393135 from master
This reverts commit b3cffde5559c4fa97625512d7ec41a674be26076 due to a regression and performance concerns. Backport of 5cc81cd9eb69f5f7a711412c02039b435c393135 from master