Convert #187339 to Flügger