Convert #284677 to Flügger