Workaround for agent related breakage till fix is available in upstream Neutron