Convert #187186 to Flügger