Revert r158259 for EFL and GTK+. They're still failing everywhere according to the...