Convert #130339 to Flügger