Convert #187489 to Flügger