[EFL] Gardening after r122408 and r122414