Sorry I meant always include this code now.  Why was it ifdef'd before?