Shifted a class out of order to allow for subclassing.
Authored by: bugman 2008-10-19
Parent: [r7844]
Child: [r7846]
