Restore conditional compilation to fix unused function warning