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