Convert #187524 to Flügger