Remove some ugly hack with an uglier hack