Convert #623294 to Flügger