Convert #473282 to Flügger