Convert #228098 to Flügger