Convert #372285 to Flügger