Convert #721285 to Flügger