Convert #187697 to Flügger