this is simpler, runs sooner, and doesn't require implementing run()
this is simpler, runs sooner, and doesn't require implementing run()


svn commit r12234

silverorange/site,nburka/site,nburka/site,silverorange/site