Revert "tweaks to ORM for extensibility"
Revert "tweaks to ORM for extensibility"

This reverts commit fdff79542cc9b8cd5db610a84e5556ef39f221c9.

avdevs/concrete5,TimDix/concrete5,matt9mg/concrete5,matt9mg/concrete5,TimDix/concrete5,MichaelMaar/concrete5,avdevs/concrete5,MichaelMaar/concrete5,TimDix/concrete5,avdevs/concrete5,MichaelMaar/concrete5,matt9mg/concrete5