Urgent fix for broken master.