More temporary ifdefs