Convert #228478 to Flügger