Switched to the internal structural object.
Authored by: bugman 2008-09-26
Parent: [r7352]
Child: [r7354]
