Reverted Bob's patch (it breaks many tests when run with opcache and needs to be fixed first).