Fixes functional tests broken by r1501.
Authored by: jplang 2008-06-07
Parent: [r1503]
Child: [r1505]