Reverting to older version. Started changing the code to remove some of the
userdata but it was left in a broken state and should not have been committed.
Authored by: levans 2012-09-07
Parent: [r722]
Child: [r724]
