Undo 2009-05-01 patch.