Rolling back my last fix so I can test further.
Authored by: cnewman@akamai.com 2010-03-24
Parent: [r1400]
Child: [r1402]