Convert #469228 to Flügger