Convert #187961 to Flügger