Remove another hack