Convert #187882 to Flügger