I guess this will make my GetWithVersion PR fail, but I'll rebase