Convert #130397 to Flügger