Convert #623966 to Flügger