removed workaround for evas brakage, now resolved.