Nobody with shell access seems to want to fix this for the current release, so I'm leaving the ticket open so that we can check after the next release that the fix I implemented above actually works.