e48d8a28e5
Due to performance degradation reported in #552. This reverts commit 490430f91d600807272c99e9fa1f495e33d1df43, reversing changes made to cf2c473a8ea003cb713b3b84138c1689f4a09be8.