Convert #187633 to Flügger