Try to fix non-unified builds again.