backport efreet fix.