Remove specific hack for now