Convert #417477 to Flügger