Merge "Revert "Have the Surface class track the buffer age.""