Convert #249751 to Flügger