Fix the "Faster UUID for entities" patch (Fixes #81)