Reverted some changes using builders for models in class hierarchies instead extending the model
Authored by: hotzst 2009-07-19
Parent: [r1692]
Child: [r1694]