Fix for compile error from bad merge with upstream.