Convert #614770 to Flügger