Remove hack for ikhal