Convert #130381 to Flügger