Remove the terrifying hack