Convert #354521 to Flügger