Use rummageable from new-api branch