Convert #187628 to Flügger