Revert unnecessary refactoring.
Revert unnecessary refactoring.

dooferlad/juju,mikemccracken/juju,axw/juju,reedobrien/juju,howbazaar/juju,tsakas/juju,mhilton/juju-juju,cloud-green/juju,cloud-green/juju,frankban/juju,dimitern/juju,alesstimec/juju,tych0/juju,mjs/juju,alesstimec/juju,frankban/juju-tmp,alesstimec/juju,AdamIsrael/juju,mhilton/juju,Altoros/juju-cloudsigma,dimitern/juju,davecheney/juju,ericsnowcurrently/juju,mjs/juju,fwereade/juju,bogdanteleaga/juju,howbazaar/juju,tasdomas/juju,gabriel-samfira/juju,tych0/juju,davecheney/juju,Altoros/juju-cloudsigma,gabriel-samfira/juju,mhilton/juju,voidspace/juju,anastasiamac/juju,mhilton/juju,bac/juju,waigani/juju,fwereade/juju,marcmolla/juju,kat-co/juju,bogdanteleaga/juju,mhilton/juju-juju,voidspace/juju,mjs/juju,mikemccracken/juju,perrito666/juju,thomnico/juju,anastasiamac/juju,anastasiamac/juju,frankban/juju,waigani/juju,voidspace/juju,bac/juju,davecheney/juju,tasdomas/juju,mhilton/juju,AdamIsrael/juju,macgreagoir/juju,bogdanteleaga/juju,frankban/juju,macgreagoir/juju,tsakas/juju,alesstimec/juju,bac/juju,perrito666/juju,mjs/juju,perrito666/juju,AdamIsrael/juju,thomnico/juju,waigani/juju,mjs/juju,alesstimec/juju,wwitzel3/juju,mjs/juju,frankban/juju-tmp,kat-co/juju,fwereade/juju,makyo/juju,frankban/juju-tmp,bz2/juju,ericsnowcurrently/juju,gabriel-samfira/juju,axw/juju,bogdanteleaga/juju,voidspace/juju,cloud-green/juju,anastasiamac/juju,ericsnowcurrently/juju,mikemccracken/juju,reedobrien/juju,bz2/juju,marcmolla/juju,gabriel-samfira/juju,marcmolla/juju,dooferlad/juju,anastasiamac/juju,dimitern/juju,reedobrien/juju,reedobrien/juju,reedobrien/juju,wwitzel3/juju,howbazaar/juju,wwitzel3/juju,bz2/juju,frankban/juju,tasdomas/juju,makyo/juju,ericsnowcurrently/juju,Altoros/juju-cloudsigma,thomnico/juju,howbazaar/juju,ericsnowcurrently/juju,macgreagoir/juju,makyo/juju,tych0/juju,kat-co/juju,bz2/juju,dooferlad/juju,perrito666/juju,makyo/juju,kat-co/juju,wwitzel3/juju,axw/juju,fwereade/juju,howbazaar/juju,tsakas/juju,mikemccracken/juju,dimitern/juju,gabriel-samfira/juju,tsakas/juju,mhilton/juju-juju,Altoros/juju-cloudsigma,mikemccracken/juju,davecheney/juju,bac/juju,axw/juju,kat-co/juju,waigani/juju,cloud-green/juju,frankban/juju,mjs/juju,marcmolla/juju,mhilton/juju-juju,tych0/juju,perrito666/juju,dooferlad/juju,axw/juju,AdamIsrael/juju,thomnico/juju,marcmolla/juju,macgreagoir/juju,tasdomas/juju,dimitern/juju,bz2/juju,frankban/juju-tmp,macgreagoir/juju,dooferlad/juju,bac/juju