Convert #228126 to Flügger