Convert #461597 to Flügger