Convert #228054 to Flügger