Boris saves City Hall 'embassies'