Convert #372286 to Flügger