This and the above `page++` will break #2660... so can this wait until that gets merged?