Convert #187629 to Flügger