Revert cases which which caused regression.
Authored by: whebisch 2009-04-26
Parent: [r599]
Child: [r601]