Convert #686338 to Flügger