Convert #284887 to Flügger