Convert #130367 to Flügger