Removed some PHP 5.3 specific code from 2.2/develop.