Forgot to remove some old #ifdef stuff.