Convert #265849 to Flügger