Better fix for bug #67072 with more BC provisions

Attempt at better resolution of bug #67072 - see http://news.php.net/php.internals/75037 for discussion.