Merge "Always use the newly-saved revision with vary-revision"