MT#8353 Fix broken build