Finally a real build fix.