Backporting commit from upstream EFL.