Convert #315438 to Flügger