Switched to conditional compilation to allow Web build