Convert #236594 to Flügger