Restore Charles' changes from revision 12641.
Authored by: briggs@adobe.com 2009-12-09
Parent: [r620]
Child: [r622]