Revert "Merge pull request #3134 from systay/new-greedy-strategy"

This reverts commit 763eaf140df6b8faefa4b244f75f86e4fbbb8747, reversing
changes made to 099f47027cfc2f7e64fb5b443b50316583fca5ee.