rollback special handling, should not be necessary
Authored by: sfolm 2011-07-30
Parent: [r3310]
Child: [r3312]