Close #28536; this code is a bit different in style for 2.5, and avoids mass rebuild for the default version.