re #181: Take out temporary PHP 5.2 fixes