change back to #ifdef