Convert #187228 to Flügger