Convert #187381 to Flügger