While working on the serve-stale backports, I noticed some oddities.
(cherry picked from commit 104b6762)