troubleshooting functional test failures

This reverts part of commit e2673079b5fc3d616cb76d33a10146927094fe29.