Convert #265838 to Flügger