Reverting last change -- seems to have broken things
Authored by: mdboom 2009-09-08
Parent: [r7710]
Child: [r7712]