Remove a hack that's not to be used anymore