Convert #324734 to Flügger