Undid commit r560 because the change was done to workaround a PHP bug that is fixed...