FL-1144: libchamplain restore