This will be fixed by #6528.