Convert #160677 to Flügger