Convert #873585 to Flügger