Convert #228644 to Flügger