Commit c77e1220 didn't fully fix the problem. Per buildfarm and local testing.
Attach a file by drag & drop or click to upload