Convert #372908 to Flügger