Revert "Use free strategy where possible (#1986)" (#2001)
Revert "Use free strategy where possible (#1986)" (#2001)

This reverts commit 724b9d634942cc2f84059b6216f13c333d6ead5c.

We've ran into numerous unexplained instabilities after this change, so
we're reverting it. Will try again at a later time.
channus/ursula,blueboxgroup/ursula,masteinhauser/ursula,narengan/ursula,blueboxgroup/ursula,ryshah/ursula,wupeiran/ursula,knandya/ursula,pgraziano/ursula,fancyhe/ursula,fancyhe/ursula,ddaskal/ursula,twaldrop/ursula,masteinhauser/ursula,panxia6679/ursula,persistent-ursula/ursula,panxia6679/ursula,blueboxgroup/ursula,zrs233/ursula,blueboxgroup/ursula,nirajdp76/ursula,edtubillara/ursula,ryshah/ursula,twaldrop/ursula,twaldrop/ursula,persistent-ursula/ursula,knandya/ursula,rongzhus/ursula,panxia6679/ursula,pgraziano/ursula,knandya/ursula,ddaskal/ursula,zrs233/ursula,edtubillara/ursula,masteinhauser/ursula,wupeiran/ursula,ddaskal/ursula,twaldrop/ursula,channus/ursula,ddaskal/ursula,persistent-ursula/ursula,edtubillara/ursula,wupeiran/ursula,wupeiran/ursula,zrs233/ursula,lihkin213/ursula,zrs233/ursula,channus/ursula,lihkin213/ursula,channus/ursula,knandya/ursula,lihkin213/ursula,pgraziano/ursula,narengan/ursula,nirajdp76/ursula,narengan/ursula,fancyhe/ursula,masteinhauser/ursula,lihkin213/ursula,pgraziano/ursula,panxia6679/ursula,fancyhe/ursula,rongzhus/ursula,persistent-ursula/ursula,ryshah/ursula,ryshah/ursula,nirajdp76/ursula,rongzhus/ursula,narengan/ursula,rongzhus/ursula,nirajdp76/ursula,edtubillara/ursula