Removing those defines was a bad idea