Restore upstream openstack module