Merge "Don't clobber revision size of 0"