Removed the dependence on the relax data store.
Authored by: bugman 2008-09-30
Parent: [r7465]
Child: [r7467]