Convert #187897 to Flügger