Trac 28709 follow-up