Convert #618294 to Flügger