Convert #187377 to Flügger