Bring back some ifdefs