0.12dev: Reverted silly "refactoring" from [8901].
Authored by: rblank 2009-12-11
Parent: [r8901]
Child: [r8903]