Reverts r1476 that is no longer needed after r3582.
Authored by: jplang 2010-03-14
Parent: [r3582]
Child: [r3584]