Revert "Attempt at a speedup for the collocation analyzer (testing now)."

This reverts commit 521975ba710b1f54f2ee30bbca145be2a8c722a9.