Revert "Fix review comments from enlightenment-devel. Thanks to discomfitor and demar...