reverting last commit. Tests are failing; need to search ...
Authored by: vsp_nagel 2012-02-18
Parent: [r18488]
Child: [r18490]