Add build fix from #2435