This is now done in rev#68610.