Re-add glacier support