I'm closing this ticket as it was fixed by #3998.