Un-reverting Joshua's bugfix since

the broken build was due to the latest version of PHP Unit 4.3.x breaking things on us.