Convert #324391 to Flügger