Convert #249791 to Flügger