Go back to branch of 2.3.x and master; force sampling to include oldest revision