Convert #354330 to Flügger