Convert #265379 to Flügger