Trac #6022 is actually fine now