Also stop using hack on UF