reverted breaking orm change
Merge pull request #659 from shackbarth/orm

reverted breaking orm change