Convert #228274 to Flügger