This reverts commit 87c8625692. This reverts commit a6dd6196b4. Reason: Performance regression (#1655) Closes #1655
87c8625692
a6dd6196b4