Convert #187927 to Flügger