Convert #187439 to Flügger