Convert #461367 to Flügger